Merge from trunk.

diff --cc src/xdisp.c
index fa4b3c4f9ab10925976b85eeb13de2d22ce85f52,d1598e5ed40f970b907e4c65be5f4bd1877e5d6b..923f0aba5918dcbad9510ac78522d8c3989607e1
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -3163,10 -3163,9 +3163,11 @@@ compute_display_string_pos (struct text
    EMACS_INT lim =
      (charpos < eob - MAX_DISP_SCAN) ? charpos + MAX_DISP_SCAN : eob;
    struct text_pos tpos;
-   struct buffer *b;
+ 
+   *disp_prop_p = 1;
  
 +  *disp_prop_p = 1;
 +
    if (charpos >= eob
        /* We don't support display properties whose values are strings
         that have display string properties.  */